Skip to content

Merge release/22.7 into trunk #15851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 11 commits into from
Jul 1, 2025
Merged

Merge release/22.7 into trunk #15851

merged 11 commits into from
Jul 1, 2025
+1,090 −8,396

Conversation

@wpmobilebot
Copy link
Collaborator

@wpmobilebot wpmobilebot commented Jul 1, 2025

Merging release/22.7 into trunk.

Via intermediate branch merge/release-22.7-into-trunk, to help fix conflicts if any:

                            release/22.7  ----o-- - - -
                                               \
           merge/release-22.7-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

staskus and others added 11 commits June 27, 2025 16:37
@staskus
Set minimum height to product row
2ed160f 
When product row has no image it becomes a smaller size than a minimum required size
@joshheald
Ignore empty scanner input
4ae56f6 
The Star scanner sends keycode 0xAE for a double trigger pull, used to switch between scanner and software keyboard.

They don’t send a character, which seems like a good criterion to ignore input.

This commit stops us showing an error row for a double-pull on the trigger.
@staskus
[Woo POS] Set the minimum product row height and make other adjustmen…
ea22858 
…ts to fix regressions (#15833)
@joshheald
Ignore empty scan input
b213840
@joshheald
Extract timeout checking to a function
9b14862
@joshheald
Don’t trigger timeouts for ignored keystrokes
b39c328
@joshheald @staskus
Update WooCommerce/Classes/POS/Presentation/Barcode Scanning/HIDBarco…
2f53a9d 
…deParser.swift

Co-authored-by: Povilas Staskus <[email protected]>
@joshheald
[Woo POS][Barcodes] Ignore empty scanner input (#15843)
6d7ade5
@wpmobilebot
Update app translations – Localizable.strings
f557b4c
@wpmobilebot
Update metadata translations
e72a1c0
@wpmobilebot
Bump version number
c767d31
@wpmobilebot wpmobilebot added the Releases Used in release management. Using this label will skip some bot checks. label Jul 1, 2025
@wpmobilebot wpmobilebot added this to the 22.8 milestone Jul 1, 2025
@dangermattic
Copy link
Collaborator

dangermattic commented Jul 1, 2025

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

@wpmobilebot
Copy link
Collaborator Author

wpmobilebot commented Jul 1, 2025

App Icon📲 You can test the changes from this Pull Request in WooCommerce iOS Prototype by scanning the QR code below to install the corresponding build.

App NameWooCommerce iOS Prototype
Build Number30918
VersionPR #15851
Bundle IDcom.automattic.alpha.woocommerce
Commitc767d31
Installation URL4gklctdu7q1ag
 Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

@staskus staskus merged commit 08af173 into trunk Jul 1, 2025
19 of 20 checks passed
@staskus staskus deleted the merge/release-22.7-into-trunk branch July 1, 2025 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@staskus staskus staskus approved these changes

Assignees

No one assigned

Labels

Releases Used in release management. Using this label will skip some bot checks.

Projects

None yet

Milestone

22.8

Development

Successfully merging this pull request may close these issues.

5 participants

@wpmobilebot @dangermattic @staskus @joshheald